Avoid an uninitialized variable warning, pointed out by Colin Walters.

2005-08-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (theme_lookup_icon): Avoid an uninitialized
	variable warning, pointed out by Colin Walters. (#314585)

diff --git a/ChangeLog b/ChangeLog
index c7f56329dc4069d3df64e7ab37b7ea90d8d2a1b4..04b55dc99750a805585751d744b80619aeee2930 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c (theme_lookup_icon): Avoid an uninitialized
+       variable warning, pointed out by Colin Walters. (#314585)
+
 2005-08-26  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkfilesystemwin32.c: Remove some ifdeffed out debugging

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7f56329dc4069d3df64e7ab37b7ea90d8d2a1b4..04b55dc99750a805585751d744b80619aeee2930 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c (theme_lookup_icon): Avoid an uninitialized
+       variable warning, pointed out by Colin Walters. (#314585)
+
 2005-08-26  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkfilesystemwin32.c: Remove some ifdeffed out debugging

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index c4e88b25507f6fa2644499b2d9d0283b675c0ae2..3afe959248e582f78162d78732a1418cde4e97ec 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1804,7 +1804,7 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
       suffix = suffix & ~HAS_ICON_FILE;
     }
   else
-      suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name));
+    suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name));
 
   GTK_NOTE (ICONTHEME, 
            g_print ("get_icon_suffix%s %d\n", dir->cache ? " (cached)" : "", suffix));
@@ -1893,7 +1893,7 @@ theme_lookup_icon (IconTheme          *theme,
   if (min_dir)
     {
       GtkIconInfo *icon_info = icon_info_new ();
-      gboolean has_icon_file;
+      gboolean has_icon_file = FALSE;
       
       suffix = theme_dir_get_icon_suffix (min_dir, icon_name, &has_icon_file);
       suffix = best_suffix (suffix, allow_svg);